merge trunk
authorK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 01:28:32 +0000 (10:28 +0900)
committerK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 01:28:32 +0000 (10:28 +0900)
commit0733c155e609dc3d7540d107f8bc3e7649676917
tree1bd5f5716db289443e96dac534da10e5dcec3fb3
parentd53a38f4726c3214b01b267d8c6f157c2952f668
parenta6008c1c2463b4ef8bf5f9de57c43bb135f35b5a
merge trunk